From 86619be2f7f527442a9cdfc4fb60e9373e72a506 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 29 Aug 2018 16:28:52 +0200 Subject: [PATCH] x86/spec-ctrl: split reporting for PV and HVM guests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Putting them on separate lines was suggested before, and is going to become necessary eventually anyway as things get added here. Split them now, and put the respective pieces in CONFIG_* conditionals at the same time. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/arch/x86/spec_ctrl.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 1eb624ecf9..1ec0f728a6 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -329,13 +329,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) * Alternatives blocks for protecting against and/or virtualising * mitigation support for guests. */ - printk(" Support for VMs: PV:%s%s%s%s, HVM:%s%s%s%s\n", - (boot_cpu_has(X86_FEATURE_SC_MSR_PV) || - boot_cpu_has(X86_FEATURE_SC_RSB_PV) || - opt_eager_fpu) ? "" : " None", - boot_cpu_has(X86_FEATURE_SC_MSR_PV) ? " MSR_SPEC_CTRL" : "", - boot_cpu_has(X86_FEATURE_SC_RSB_PV) ? " RSB" : "", - opt_eager_fpu ? " EAGER_FPU" : "", +#ifdef CONFIG_HVM + printk(" Support for HVM VMs:%s%s%s%s\n", (boot_cpu_has(X86_FEATURE_SC_MSR_HVM) || boot_cpu_has(X86_FEATURE_SC_RSB_HVM) || opt_eager_fpu) ? "" : " None", @@ -343,7 +338,16 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) boot_cpu_has(X86_FEATURE_SC_RSB_HVM) ? " RSB" : "", opt_eager_fpu ? " EAGER_FPU" : ""); +#endif #ifdef CONFIG_PV + printk(" Support for PV VMs:%s%s%s%s\n", + (boot_cpu_has(X86_FEATURE_SC_MSR_PV) || + boot_cpu_has(X86_FEATURE_SC_RSB_PV) || + opt_eager_fpu) ? "" : " None", + boot_cpu_has(X86_FEATURE_SC_MSR_PV) ? " MSR_SPEC_CTRL" : "", + boot_cpu_has(X86_FEATURE_SC_RSB_PV) ? " RSB" : "", + opt_eager_fpu ? " EAGER_FPU" : ""); + printk(" XPTI (64-bit PV only): Dom0 %s, DomU %s (with%s PCID)\n", opt_xpti & OPT_XPTI_DOM0 ? "enabled" : "disabled", opt_xpti & OPT_XPTI_DOMU ? "enabled" : "disabled", -- 2.30.2